Don't leak the menu. (#148110, Tommi Komulainen)

Wed Jul 21 22:35:47 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak the
	menu.  (#148110, Tommi Komulainen)

diff --git a/ChangeLog b/ChangeLog
index 02551cd49a02a806c3615db57493db514bf6e437..1bb558ca312a3f1196f67d4f0acfdab5324cb628 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 21 22:35:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak the
+       menu.  (#148110, Tommi Komulainen)
+
 Wed Jul 21 22:24:10 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 02551cd49a02a806c3615db57493db514bf6e437..1bb558ca312a3f1196f67d4f0acfdab5324cb628 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Jul 21 22:35:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak the
+       menu.  (#148110, Tommi Komulainen)
+
 Wed Jul 21 22:24:10 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 02551cd49a02a806c3615db57493db514bf6e437..1bb558ca312a3f1196f67d4f0acfdab5324cb628 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Jul 21 22:35:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak the
+       menu.  (#148110, Tommi Komulainen)
+
 Wed Jul 21 22:24:10 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 02551cd49a02a806c3615db57493db514bf6e437..1bb558ca312a3f1196f67d4f0acfdab5324cb628 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Jul 21 22:35:47 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak the
+       menu.  (#148110, Tommi Komulainen)
+
 Wed Jul 21 22:24:10 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 489bfcbb474d9a54a33cb6870a847b602b63807f..4520e27c98f30e2fd24f72e5d9e5ba326081c1df 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -4019,7 +4019,11 @@ gtk_combo_box_finalize (GObject *object)
   GSList *i;
   
   if (GTK_IS_MENU (combo_box->priv->popup_widget))
-    gtk_combo_box_menu_destroy (combo_box);
+    {
+      gtk_combo_box_menu_destroy (combo_box);
+      gtk_menu_detach (GTK_MENU (combo_box->priv->popup_widget));
+      combo_box->priv->popup_widget = NULL;
+    }
   
   if (GTK_IS_TREE_VIEW (combo_box->priv->tree_view))
     gtk_combo_box_list_destroy (combo_box);
@@ -4029,9 +4033,6 @@ gtk_combo_box_finalize (GObject *object)
 
   gtk_combo_box_unset_model (combo_box);
 
-  if (combo_box->priv->model)
-    g_object_unref (combo_box->priv->model);
-
   for (i = combo_box->priv->cells; i; i = i->next)
     {
       ComboCellInfo *info = (ComboCellInfo *)i->data;